Skip to content

Conversation

@dumbmoron
Copy link
Contributor

@dumbmoron dumbmoron commented Oct 24, 2025

Instead of deleting copies of generic patches when unmerging them from platform patches, move them back into the shared repository.

This makes it much more pleasant and ergonomic to work on shared patches in a merged series, and allows to refresh, or otherwise modify existing patches by "unmerging", instead of having to move them back to the original folder manually.

My case for why this potentially breaking change should be made: I have been using this as a personal preference in helium for a few months: imputnet/helium@d56c8d5, and it has made working with patch series much simpler - so much that I believe it should be a default everywhere. To my knowledge, it should not break any build processes, since unmerging is usually done as a manual action by a human when working on patches.

@dumbmoron dumbmoron requested a review from a team as a code owner October 24, 2025 12:48
@dumbmoron dumbmoron force-pushed the platform-patches-unmerge-rename branch from 430ebab to 7cc394a Compare October 24, 2025 12:50
Copy link
Contributor

@Ahrotahn Ahrotahn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems fine to me so long as it doesn't cause any issues for other platform maintainers.

@networkException
Copy link
Member

Arch and NixOS won't be affected I believe, lets wait for everyone else to get a chance to look at this though :)

@networkException
Copy link
Member

@ungoogled-software/windows @ungoogled-software/macos

@Qubik65536
Copy link
Member

I believe macOS will also be unaffected. Worst case I will try to start a new build with this later to confirm.

@teeminus
Copy link
Contributor

I think windows should be unaffected as well. We first apply the common patches before (only) refreshing the platform patches to speedup refresh.

@clickot
Copy link
Contributor

clickot commented Oct 25, 2025

fine for me

@dumbmoron dumbmoron force-pushed the platform-patches-unmerge-rename branch from 7cc394a to eae5d18 Compare November 1, 2025 14:34
@PF4Public
Copy link
Contributor

I never used this script, so I cannot asses the changes, but if it doesn"t have any side-effects, should we merge the PR?

@clickot
Copy link
Contributor

clickot commented Nov 17, 2025

@PF4Public @Ahrotahn @networkException shouldn't we merge this one?

@Ahrotahn
Copy link
Contributor

I've already given my approval! @PF4Public @networkException Were there any objections to merging this?

Copy link
Member

@networkException networkException left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope! I'd like to get the zero day bump fix out first though

@Ahrotahn
Copy link
Contributor

@dumbmoron When you get the time give this one more rebase over the latest changes and I'll merge when I get the chance!

Instead of deleting copies of generic patches when unmerging them
from platform patches, move them back into the shared repository.

This makes it much more pleasant and ergonomic to work on patches
as a merged series, and allows to e.g. refresh existing patches
without having to move them back to the original folder manually.
@dumbmoron dumbmoron force-pushed the platform-patches-unmerge-rename branch from eae5d18 to aebf0a4 Compare November 21, 2025 17:45
@Ahrotahn Ahrotahn merged commit aebf0a4 into ungoogled-software:master Nov 27, 2025
3 checks passed
@dumbmoron dumbmoron deleted the platform-patches-unmerge-rename branch November 27, 2025 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants